projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: fff84c2) | patch
* lisp/net/rcirc.el (rcirc-server-alist, rcirc, rcirc-connect): Resolve
authorStefan Monnier <monnier@iro.umontreal.ca>
Thu, 10 Jun 2010 01:10:04 +0000 (21:10 -0400)
committerStefan Monnier <monnier@iro.umontreal.ca>
Thu, 10 Jun 2010 01:10:04 +0000 (21:10 -0400)
commita71832f78d2fa8128a03aeb551a1ec0895b49f67
treecfc3957c629d290b3af9e4f71a6b8e89d8bf4c10tree | snapshot
parentfff84c22e7e57d7364c2298aebf1b35796fc852bcommit | diff
* lisp/net/rcirc.el (rcirc-server-alist, rcirc, rcirc-connect): Resolve
merge conflict, giving preference to the emacs-23 version of the code.
lisp/ChangeLog diff | blob | history
lisp/net/rcirc.el diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.